Fix the cups checks
authorMatthias Clasen <mclasen@redhat.com>
Tue, 1 Sep 2009 03:59:44 +0000 (23:59 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 1 Sep 2009 03:59:44 +0000 (23:59 -0400)
This was reported in bug 593712.

configure.in

index 7093a0a05468543e71a6cd2ea5f302ace541a51f..b2857a7f00b43e0ad253938305cefa48947249c2 100644 (file)
@@ -1873,24 +1873,24 @@ else
     AC_SUBST(CUPS_LIBS)
 
     AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]]))
-  fi
 
-  AM_CONDITIONAL(HAVE_CUPS, true)
+    AM_CONDITIONAL(HAVE_CUPS, true)
 
-  gtk_save_cflags="$CFLAGS"
-  CFLAGS="$CUPS_CFLAGS"
-  AC_TRY_COMPILE([#include <cups/http.h>],
-                 [http_t http; char *s = http.authstring;],
-                 [AC_DEFINE(HAVE_HTTP_AUTHSTRING, [],
-                            [Define if cups http_t authstring field is accessible])],)
-  CFLAGS="$gtk_save_cflags"
+    gtk_save_cflags="$CFLAGS"
+    CFLAGS="$CUPS_CFLAGS"
+    AC_TRY_COMPILE([#include <cups/http.h>],
+                   [http_t http; char *s = http.authstring;],
+                   [AC_DEFINE(HAVE_HTTP_AUTHSTRING, [],
+                              [Define if cups http_t authstring field is accessible])],)
+    CFLAGS="$gtk_save_cflags"
 
-  AC_SUBST(HAVE_HTTP_AUTHSTRING)
+    AC_SUBST(HAVE_HTTP_AUTHSTRING)
 
-  gtk_save_libs="$LIBS"
-  LIBS="$CUPS_LIBS"
-  AC_CHECK_FUNCS(httpGetAuthString)
-  LIBS="$gtk_save_libs"
+    gtk_save_libs="$LIBS"
+    LIBS="$CUPS_LIBS"
+    AC_CHECK_FUNCS(httpGetAuthString)
+    LIBS="$gtk_save_libs"
+  fi
 fi
 
 # Checks to see if we should compile with PAPI backend for GTK+